Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement sizeof and alignof operator (manually squashed @krux02 's PR #5664) #9356

Merged
merged 1 commit into from
Oct 13, 2018

Conversation

timotheecour
Copy link
Member

@timotheecour timotheecour commented Oct 13, 2018

/cc @Araq @krux02

git fetch origin pull/5664/head:pr_5664
git checkout pr_5664
git merge origin/devel
git checkout pull_5664_3 -b origin/devel
git checkout pr_5664 -- `git diff --name-only pr_5664`
# give proper attribution it to @krux02
git commit --amend --author="Arne Döring <[email protected]>"

EDIT for this to be attributed to original PR author, looks like the resulting squashed PR needs to be merged in github via "merge commit" or "rebase merging"; "squash" would overwrite the author field with the committer.

@timotheecour timotheecour changed the title implement sizeof and alignof operator (manually squashed #5664) implement sizeof and alignof operator (manually squashed @krux02 's PR #5664) Oct 13, 2018
@Araq Araq merged commit 745f164 into nim-lang:devel Oct 13, 2018
@timotheecour timotheecour deleted the pull_5664_3 branch October 13, 2018 23:18
krux02 pushed a commit to krux02/Nim that referenced this pull request Oct 15, 2018
narimiran pushed a commit to narimiran/Nim that referenced this pull request Oct 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants